/**
 * @Author: 平川
 * @Description:
 * @Date Created in 2021-10-08 14:55
 * @Modified By:
 */
public class MyGitTest {
    public void git(){
        System.out.println("测试idea中的分支合并，出现的分支冲突！");
    }
}